Fix compile error in mcpGatewayToolBrokerChannel test#299072
Merged
connor4312 merged 15 commits intomainfrom Mar 4, 2026
Merged
Fix compile error in mcpGatewayToolBrokerChannel test#299072connor4312 merged 15 commits intomainfrom
connor4312 merged 15 commits intomainfrom
Conversation
Instead of immediately returning empty results for Unknown-state servers and refreshing in the background, wait up to 5 seconds for the server to become live on the first list call. Subsequent calls find the already- resolved promise in _startupGrace and return immediately, so only the first message pays the startup cost. - _waitForStartup: races _ensureServerReady against the configurable grace period (default 5 000 ms); result is cached per server - _shouldUseCachedData: awaits the grace period for Unknown servers, falls back to background-refresh for Outdated servers - _listTools: refactored to Promise.all to parallelise per-server waits - Tests: updated 'starts server when cache state is unknown' to assert tools are returned after the grace period; added new test for the timeout path using createNeverStartingServer
Per review feedback: Outdated servers should use the same per-server startup grace period as Unknown servers. A prior fast startup does not guarantee a fast restart, so both states now race startup against the 5s timeout before returning results.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a compile error introduced in PR #298040 ("MCP Gateway: avoid blocking list calls on startup"). The main change is correcting the Promise type parameter in createNeverStartingServer from the overly-broad { state: McpConnectionState.Kind } to the correct McpConnectionState union type. The PR also includes the underlying feature changes from #298040: a startup grace period mechanism in McpGatewayToolBrokerChannel that races server startup against a configurable timeout, allowing cached data to be returned immediately without blocking list calls on server startup.
Changes:
- Added a
_startupGraceper-server promise cache and_waitForStartup/_shouldUseCachedDatamethods toMcpGatewayToolBrokerChannel, replacing the direct_ensureServerReadyblocking calls in_listTools,_listResources, and_listResourceTemplates - Fixed compile error in test:
new Promise<McpConnectionState>(() => { })instead ofnew Promise<{ state: McpConnectionState.Kind }>(() => { }) - Added new test cases covering the grace period behavior for
Unknown,Outdated, and never-starting servers
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/vs/workbench/contrib/mcp/common/mcpGatewayToolBrokerChannel.ts |
Adds startup grace period mechanism: _startupGrace map, _waitForStartup, and _shouldUseCachedData; updates _listTools, _listResources, _listResourceTemplates to use it |
src/vs/workbench/contrib/mcp/test/common/mcpGatewayToolBrokerChannel.test.ts |
Fixes compile error in createNeverStartingServer; adds createNeverStartingServer helper and three new tests for startup/grace period behavior |
You can also share your feedback on Copilot code review. Take the survey.
dmitrivMS
approved these changes
Mar 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes compile error from #298040 — the Promise type parameter in createNeverStartingServer used { state: McpConnectionState.Kind } (wide enum type) instead of McpConnectionState.